From 53831e67a77aaaacc17a8f7ec9a942bd097e9e2b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 13 Jul 2020 07:29:03 -0400
Subject: [PATCH] Integrate the new icons

Install and use the node-editor and print-editor icons.
---
 demos/node-editor/meson.build                   | 9 +++++++++
 demos/node-editor/node-editor-application.c     | 2 +-
 demos/print-editor/meson.build                  | 9 +++++++++
 demos/print-editor/org.gtk.PrintEditor4.desktop | 2 +-
 demos/print-editor/print-editor.c               | 2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/demos/node-editor/meson.build b/demos/node-editor/meson.build
index d09b4bd7a5..b8513fb223 100644
--- a/demos/node-editor/meson.build
+++ b/demos/node-editor/meson.build
@@ -19,3 +19,12 @@ executable('gtk4-node-editor',
            gui_app: true,
            link_args: extra_demo_ldflags,
            install: false)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
diff --git a/demos/node-editor/node-editor-application.c b/demos/node-editor/node-editor-application.c
index 84561ec73c..abc8dea47b 100644
--- a/demos/node-editor/node-editor-application.c
+++ b/demos/node-editor/node-editor-application.c
@@ -101,7 +101,7 @@ activate_about (GSimpleAction *action,
                          "website", "http://www.gtk.org",
                          "comments", "Program to test GTK rendering",
                          "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL},
-                         "logo-icon-name", "org.gtk.gtk4.NodeEditor",
+                         "logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel",
                          "title", "About GTK Node Editor",
                          "system-information", s->str,
                          NULL);
diff --git a/demos/print-editor/meson.build b/demos/print-editor/meson.build
index 9b3e7910c5..15b12d57e3 100644
--- a/demos/print-editor/meson.build
+++ b/demos/print-editor/meson.build
@@ -12,3 +12,12 @@ install_data('org.gtk.PrintEditor4.desktop', install_dir: gtk_applicationsdir)
 
 # appdata
 install_data('org.gtk.PrintEditor4.appdata.xml', install_dir: gtk_appdatadir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
diff --git a/demos/print-editor/org.gtk.PrintEditor4.desktop b/demos/print-editor/org.gtk.PrintEditor4.desktop
index 7c663365d3..87f5799e9b 100644
--- a/demos/print-editor/org.gtk.PrintEditor4.desktop
+++ b/demos/print-editor/org.gtk.PrintEditor4.desktop
@@ -2,7 +2,7 @@
 Name=Print Editor
 Comment=A simple editor demonstrating GTK printing
 Exec=gtk4-print-editor %f
-Icon=text-editor-symbolic
+Icon=org.gtk.PrintEditor4.Devel
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c
index 641a1f7cac..e6353fa054 100644
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -633,7 +633,7 @@ activate_about (GSimpleAction *action,
                          "website", "http://www.gtk.org",
                          "comments", "Program to demonstrate GTK printing",
                          "authors", (const char *[]){ "Alexander Larsson", NULL },
-                         "logo-icon-name", "org.gtk.PrintEditor4",
+                         "logo-icon-name", "org.gtk.PrintEditor4.Devel",
                          "title", "About GTK Print Editor",
                          "system-information", sysinfo->str,
                          NULL);
-- 
2.30.2